api/eqpt_views.py

@@ -218,19 +218,20 @@ def get_screen_data(point=None, point_id=None):

                         point_measure_window=point.previous_measure_window,
              

                         macid__in=macids,
              

                         status=True,
              

                -    ).values('macid', 'temperature')
              

                -    logs = {log.get('macid'): log.get('temperature') or get_old_temperature(point.point_id, log.get('macid')) for log in logs}
              

                +    ).values('macid', 'temperature', 'updated_at')
              

                +    temperature_logs = {log.get('macid'): log.get('temperature') or get_old_temperature(point.point_id, log.get('macid')) for log in logs}
              

                +    time_logs = {log.get('macid'): tc.local_string(utc_dt=log.get('updated_at'), format='%m-%d %H:%M') for log in logs}
              

                 
              

                     ipuis = IsolationPointUserInfo.objects.filter(point_id=point.point_id, status=True).values('pk', 'fields', 'observed_days')
              

                     ipuis = {info.get('pk'): {'fields': info.get('fields'), 'observed_days': info.get('observed_days')} for info in ipuis}
              

                 
              

                     total_active_eqpt_num = eqpts.count()
              

                -    has_upload_temperature_num = len(logs)
              

                -    fever_num = len([1 for temperature in logs.values() if temperature > settings.FEVER_TEMPERATURE])
              

                +    has_upload_temperature_num = len(temperature_logs)
              

                +    fever_num = len([1 for temperature in temperature_logs.values() if temperature > settings.FEVER_TEMPERATURE])
              

                 
              

                     eqpts = [{**eqpt.screen_data, **{
              

                -        'has_upload': eqpt.macid in logs,
              

                -        'temperature': logs.get(eqpt.macid, 0),
              

                +        'has_upload': eqpt.macid in temperature_logs,
              

                +        'temperature': temperature_logs.get(eqpt.macid, 0),
              

                         'observed_days': ipuis.get(eqpt.ipui_pk, {}).get('observed_days', 0),
              

                     }, **{field.get('key', ''): field.get('value', '') for field in ipuis.get(eqpt.ipui_pk, {}).get('fields', {})}} for eqpt in eqpts]
              

                     reminds = [{
              
@@ -257,7 +258,7 @@ def get_screen_data(point=None, point_id=None):

                         'age': eqpt.get('age', ''),
              

                         'temperature': eqpt.get('temperature', ''),
              

                         'status': '已上报' if eqpt.get('temperature') else '未上报',
              

                -        'last_report_time': eqpt.get('last_submit_at', ''),
              

                +        'last_report_time': time_logs.get(eqpt.macid) if eqpt.get('temperature') else eqpt.get('last_submit_at', ''),
              

                         'observed_days': eqpt.get('observed_days', 0),
              

                     } for eqpt in eqpts]